Domain0 doesn't do initial VCPU hotplug via xenstore.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c
index 4b84de07ccba2a4057aaa16881fa9f09ea2a5a03..20f96c0da34c335f2fa13b056f6ee8f78faa8e4a 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c
@@ -313,10 +313,12 @@ static int setup_cpu_watcher(struct notifier_block *notifier,
                .callback = handle_vcpu_hotplug_event };
        (void)register_xenbus_watch(&cpu_watch);
 
-       for_each_cpu(i)
-               vcpu_hotplug(i);
-
-       printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
+       if (!(xen_start_info->flags & SIF_INITDOMAIN)) {
+               for_each_cpu(i)
+                       vcpu_hotplug(i);
+               printk(KERN_INFO "Brought up %ld CPUs\n",
+                      (long)num_online_cpus());
+       }
 
        return NOTIFY_DONE;
 }